From b07bb957ff18b9e83e2edb385606de599acf61f1 Mon Sep 17 00:00:00 2001
From: "kaf24@firebug.cl.cam.ac.uk" <kaf24@firebug.cl.cam.ac.uk>
Date: Sat, 6 Aug 2005 09:52:01 +0000
Subject: [PATCH] - include linux/vmalloc.h for vmalloc - include grant table
 includes from common.h rather than blkback.c,   since both C files use grant
 tables - include linux/version.h from block.h (a macro there uses it) -
 include asm-xen/hypervisor.h from block.h (virt_to_machine)

Signed-off-by: Matthew Chapman <matthewc@hp.com>
---
 linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c | 3 ---
 linux-2.6-xen-sparse/drivers/xen/blkback/common.h  | 4 ++++
 linux-2.6-xen-sparse/drivers/xen/blkfront/block.h  | 2 ++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c b/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c
index dc60b8fc8e..1121aeb56b 100644
--- a/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c
+++ b/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c
@@ -12,9 +12,6 @@
  */
 
 #include "common.h"
-#ifdef CONFIG_XEN_BLKDEV_GRANT
-#include <asm-xen/xen-public/grant_table.h>
-#endif
 
 /*
  * These are rather arbitrary. They are fairly large because adjacent requests
diff --git a/linux-2.6-xen-sparse/drivers/xen/blkback/common.h b/linux-2.6-xen-sparse/drivers/xen/blkback/common.h
index bc36983ce7..2b30937ad4 100644
--- a/linux-2.6-xen-sparse/drivers/xen/blkback/common.h
+++ b/linux-2.6-xen-sparse/drivers/xen/blkback/common.h
@@ -9,6 +9,7 @@
 #include <linux/interrupt.h>
 #include <linux/slab.h>
 #include <linux/blkdev.h>
+#include <linux/vmalloc.h>
 #include <asm/io.h>
 #include <asm/setup.h>
 #include <asm/pgalloc.h>
@@ -17,6 +18,9 @@
 #include <asm-xen/hypervisor.h>
 #include <asm-xen/xen-public/io/blkif.h>
 #include <asm-xen/xen-public/io/ring.h>
+#ifdef CONFIG_XEN_BLKDEV_GRANT
+#include <asm-xen/gnttab.h>
+#endif
 
 #if 0
 #define ASSERT(_p) \
diff --git a/linux-2.6-xen-sparse/drivers/xen/blkfront/block.h b/linux-2.6-xen-sparse/drivers/xen/blkfront/block.h
index 412d9a4394..07ebdcbca8 100644
--- a/linux-2.6-xen-sparse/drivers/xen/blkfront/block.h
+++ b/linux-2.6-xen-sparse/drivers/xen/blkfront/block.h
@@ -33,6 +33,7 @@
 #define __XEN_DRIVERS_BLOCK_H__
 
 #include <linux/config.h>
+#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
@@ -44,6 +45,7 @@
 #include <linux/blkdev.h>
 #include <linux/major.h>
 #include <linux/devfs_fs_kernel.h>
+#include <asm-xen/hypervisor.h>
 #include <asm-xen/xen-public/xen.h>
 #include <asm-xen/xen-public/io/blkif.h>
 #include <asm-xen/xen-public/io/ring.h>
-- 
2.30.2